Deprecate gtk_entry_set_editable. (#58768, Vitaly Tishkov)

Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
        (#58768, Vitaly Tishkov)

        * gtk/gtkobject.h: Deprecate with abandon.
        (#61942, Vitaly Tishkov, Matthias Clasen)

        * gtk/gtksignal.h: Deprecate everything.

        * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
        all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
        (#61942, Matthias Clasen)

        * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
        Havoc Pennington)

        * gtk/gtkitemfactory.h: Deprecate compat functions
        for GtkMenuFactory code. (#62071)

        * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
        gdk_draw_text,gdk_draw_text_wc. (#62071)

        * gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
        Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
        to gtk_clipboard_get().

diff --git a/ChangeLog b/ChangeLog
index ab5603e5b7d8df46159bb84c0cb25332c41b5cbf..ef15b71a0c20ab6a67c88287167ab0891ae47dc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
+       (#58768, Vitaly Tishkov)
+       
+       * gtk/gtkobject.h: Deprecate with abandon. 
+       (#61942, Vitaly Tishkov, Matthias Clasen)
+
+       * gtk/gtksignal.h: Deprecate everything.
+
+       * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
+       all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
+       (#61942, Matthias Clasen)
+
+       * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
+       Havoc Pennington)
+
+       * gtk/gtkitemfactory.h: Deprecate compat functions
+       for GtkMenuFactory code. (#62071)
+
+       * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
+       gdk_draw_text,gdk_draw_text_wc. (#62071)
+
 Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ab5603e5b7d8df46159bb84c0cb25332c41b5cbf..ef15b71a0c20ab6a67c88287167ab0891ae47dc2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,26 @@
+Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
+       (#58768, Vitaly Tishkov)
+       
+       * gtk/gtkobject.h: Deprecate with abandon. 
+       (#61942, Vitaly Tishkov, Matthias Clasen)
+
+       * gtk/gtksignal.h: Deprecate everything.
+
+       * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
+       all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
+       (#61942, Matthias Clasen)
+
+       * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
+       Havoc Pennington)
+
+       * gtk/gtkitemfactory.h: Deprecate compat functions
+       for GtkMenuFactory code. (#62071)
+
+       * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
+       gdk_draw_text,gdk_draw_text_wc. (#62071)
+
 Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ab5603e5b7d8df46159bb84c0cb25332c41b5cbf..ef15b71a0c20ab6a67c88287167ab0891ae47dc2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,26 @@
+Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
+       (#58768, Vitaly Tishkov)
+       
+       * gtk/gtkobject.h: Deprecate with abandon. 
+       (#61942, Vitaly Tishkov, Matthias Clasen)
+
+       * gtk/gtksignal.h: Deprecate everything.
+
+       * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
+       all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
+       (#61942, Matthias Clasen)
+
+       * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
+       Havoc Pennington)
+
+       * gtk/gtkitemfactory.h: Deprecate compat functions
+       for GtkMenuFactory code. (#62071)
+
+       * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
+       gdk_draw_text,gdk_draw_text_wc. (#62071)
+
 Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ab5603e5b7d8df46159bb84c0cb25332c41b5cbf..ef15b71a0c20ab6a67c88287167ab0891ae47dc2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,26 @@
+Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
+       (#58768, Vitaly Tishkov)
+       
+       * gtk/gtkobject.h: Deprecate with abandon. 
+       (#61942, Vitaly Tishkov, Matthias Clasen)
+
+       * gtk/gtksignal.h: Deprecate everything.
+
+       * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
+       all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
+       (#61942, Matthias Clasen)
+
+       * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
+       Havoc Pennington)
+
+       * gtk/gtkitemfactory.h: Deprecate compat functions
+       for GtkMenuFactory code. (#62071)
+
+       * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
+       gdk_draw_text,gdk_draw_text_wc. (#62071)
+
 Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ab5603e5b7d8df46159bb84c0cb25332c41b5cbf..ef15b71a0c20ab6a67c88287167ab0891ae47dc2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,26 @@
+Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
+       (#58768, Vitaly Tishkov)
+       
+       * gtk/gtkobject.h: Deprecate with abandon. 
+       (#61942, Vitaly Tishkov, Matthias Clasen)
+
+       * gtk/gtksignal.h: Deprecate everything.
+
+       * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
+       all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
+       (#61942, Matthias Clasen)
+
+       * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
+       Havoc Pennington)
+
+       * gtk/gtkitemfactory.h: Deprecate compat functions
+       for GtkMenuFactory code. (#62071)
+
+       * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
+       gdk_draw_text,gdk_draw_text_wc. (#62071)
+
 Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ab5603e5b7d8df46159bb84c0cb25332c41b5cbf..ef15b71a0c20ab6a67c88287167ab0891ae47dc2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,26 @@
+Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
+       (#58768, Vitaly Tishkov)
+       
+       * gtk/gtkobject.h: Deprecate with abandon. 
+       (#61942, Vitaly Tishkov, Matthias Clasen)
+
+       * gtk/gtksignal.h: Deprecate everything.
+
+       * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
+       all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
+       (#61942, Matthias Clasen)
+
+       * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
+       Havoc Pennington)
+
+       * gtk/gtkitemfactory.h: Deprecate compat functions
+       for GtkMenuFactory code. (#62071)
+
+       * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
+       gdk_draw_text,gdk_draw_text_wc. (#62071)
+
 Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ab5603e5b7d8df46159bb84c0cb25332c41b5cbf..ef15b71a0c20ab6a67c88287167ab0891ae47dc2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,26 @@
+Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
+       (#58768, Vitaly Tishkov)
+       
+       * gtk/gtkobject.h: Deprecate with abandon. 
+       (#61942, Vitaly Tishkov, Matthias Clasen)
+
+       * gtk/gtksignal.h: Deprecate everything.
+
+       * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
+       all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
+       (#61942, Matthias Clasen)
+
+       * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
+       Havoc Pennington)
+
+       * gtk/gtkitemfactory.h: Deprecate compat functions
+       for GtkMenuFactory code. (#62071)
+
+       * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
+       gdk_draw_text,gdk_draw_text_wc. (#62071)
+
 Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 7fb518696bb324e3f02fe82f54fb2a27374c13cf..edaf700392f4bfed351fd5949d48580ca7fe2b00 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -195,6 +195,7 @@ void gdk_draw_polygon   (GdkDrawable      *drawable,
                         gint              filled,
                         GdkPoint         *points,
                         gint              npoints);
+#ifndef GDK_DISABLE_DEPRECATED
 void gdk_draw_string    (GdkDrawable      *drawable,
                         GdkFont          *font,
                         GdkGC            *gc,
@@ -215,6 +216,7 @@ void gdk_draw_text_wc   (GdkDrawable      *drawable,
                         gint              y,
                         const GdkWChar   *text,
                         gint              text_length);
+#endif /* GDK_DISABLE_DEPRECATED */
 void gdk_draw_drawable  (GdkDrawable      *drawable,
                         GdkGC            *gc,
                         GdkDrawable      *src,

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index dfbcb4ac9b4e94e8ff575afcea24fc6ddd58324f..503cd42b45b5f32bb90a52678e1b4ad5a16320b5 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2156,7 +2156,7 @@ gtk_entry_copy_clipboard (GtkEntry *entry)
   if (gtk_editable_get_selection_bounds (editable, &start, &end))
     {
       gchar *str = gtk_entry_get_public_chars (entry, start, end);
-      gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), str, -1);
+      gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), str, -1);
       g_free (str);
     }
 }

diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index c4c04efb894179ec11ed23719fdb2b6b4f3e1d29..8243edee653d551e6e37a24870cac2565334c398 100644 (file)
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -146,8 +146,6 @@ gboolean   gtk_entry_get_visibility             (GtkEntry      *entry);
 void       gtk_entry_set_invisible_char         (GtkEntry      *entry,
                                                  gunichar       ch);
 gunichar   gtk_entry_get_invisible_char         (GtkEntry      *entry);
-void       gtk_entry_set_editable              (GtkEntry      *entry,
-                                                gboolean       editable);
 void       gtk_entry_set_has_frame              (GtkEntry      *entry,
                                                  gboolean       setting);
 gboolean   gtk_entry_get_has_frame              (GtkEntry      *entry);
@@ -189,6 +187,8 @@ void       gtk_entry_set_position                   (GtkEntry      *entry,
 void       gtk_entry_select_region             (GtkEntry      *entry,
                                                 gint           start,
                                                 gint           end);
+void       gtk_entry_set_editable              (GtkEntry      *entry,
+                                                gboolean       editable);
 #endif /* GTK_DISABLE_DEPRECATED */
 
 #ifdef __cplusplus

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 5132f9d1dba4bcdf9211cb149a7f1ea6111b8cf2..2fba37fd5883136ca391aa9def6eeb55e9feb1bd 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -215,6 +215,7 @@ void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
                                            gpointer             data,
                                            GtkDestroyNotify     notify);
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* Compatibility functions for deprecated GtkMenuFactory code
  */
 typedef void (*GtkMenuCallback) (GtkWidget *widget,
@@ -239,7 +240,7 @@ void        gtk_item_factory_create_items_ac (GtkItemFactory        *ifactory,
                                          GtkItemFactoryEntry   *entries,
                                          gpointer               callback_data,
                                          guint                  callback_type);
-
+#endif /* GTK_DISABLE_DEPRECATED */
 
 
 #ifdef __cplusplus

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 23cfa660693afaf5fbd6d5eb89ec42ace71cfc51..8fe045936ad649f3a420dc79b8614f00a9a366fc 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3014,7 +3014,7 @@ gtk_label_copy_clipboard (GtkLabel *label)
         start = len;
 
       if (start != end)
-       gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE),
+       gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
                                label->text + start, end - start);
     }
 }

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index a798bd71c3260a9e2d4eb961641794bf89b10bda..93a6d4c95f911fe5c993926217836ca72bb110dc 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -38,9 +38,13 @@ extern "C" {
 
 /* Priorities for redrawing and resizing
  */
-#define GTK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
 #define GTK_PRIORITY_RESIZE     (G_PRIORITY_HIGH_IDLE + 10)
 
+#ifndef GTK_DISABLE_DEPRECATED
+
+/* Use GDK_PRIORITY_REDRAW */
+#define GTK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
+
 /* Deprecated. Use G_PRIORITY #define's instead
  */
 #define GTK_PRIORITY_HIGH       G_PRIORITY_HIGH
@@ -48,6 +52,8 @@ extern "C" {
 #define GTK_PRIORITY_DEFAULT   G_PRIORITY_DEFAULT_IDLE
 #define GTK_PRIORITY_LOW       G_PRIORITY_LOW
 
+#endif /* GTK_DISABLE_DEPRECATED */
+
 typedef void   (*GtkModuleInitFunc)    (gint           *argc,
                                         gchar        ***argv);
 typedef gint   (*GtkKeySnoopFunc)      (GtkWidget      *grab_widget,

diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 6650b953345b45c769a20fc7601e222c31f150d5..9f1ce101801ebe8ed697df5e4e94096dcefb7c4f 100644 (file)
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -32,11 +32,7 @@
 #include <gtk/gtktypeutils.h>
 #include <gtk/gtkdebug.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 /* macros for casting a pointer to a GtkObject or GtkObjectClass pointer,
  * and to test whether `object' and `klass' are of type GTK_TYPE_OBJECT.
@@ -136,17 +132,22 @@ GtkType   gtk_object_get_type             (void) G_GNUC_CONST;
 GtkObject*     gtk_object_new            (GtkType             type,
                                           const gchar        *first_property_name,
                                           ...);
+
+void gtk_object_sink     (GtkObject *object);
+void gtk_object_destroy          (GtkObject *object);
+
+/****************************************************************/
+
+#ifndef GTK_DISABLE_DEPRECATED 
+
 GtkObject*     gtk_object_ref            (GtkObject          *object);
 void           gtk_object_unref          (GtkObject          *object);
-void gtk_object_sink     (GtkObject        *object);
 void gtk_object_weakref          (GtkObject        *object,
                           GtkDestroyNotify  notify,
                           gpointer          data);
 void gtk_object_weakunref (GtkObject       *object,
                           GtkDestroyNotify  notify,
                           gpointer          data);
-void gtk_object_destroy          (GtkObject *object);
-
 
 /* Set 'data' to the "object_data" field of the object. The
  *  data is indexed by the "key". If there is already data
@@ -203,10 +204,6 @@ void  gtk_object_remove_no_notify_by_id    (GtkObject       *object,
 #define        gtk_object_data_try_key     g_quark_try_string
 #define        gtk_object_data_force_id    g_quark_from_string
 
-
-/* Non-public methods */
-
-
 /* GtkArg flag bits for gtk_object_add_arg_type
  */
 typedef enum
@@ -229,10 +226,8 @@ void       gtk_object_add_arg_type         (const gchar    *arg_name,
                                         guint           arg_flags,
                                         guint           arg_id);
 
+#endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_OBJECT_H__ */

diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index 827efddd0a92c6ecc1e83dc62c6a5fc62ba9f1b5..5182c1e1f91b9f8048ec4164eef4630024582a40 100644 (file)
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -792,7 +792,7 @@ gtk_old_editable_real_copy_clipboard (GtkOldEditable *old_editable)
 
       if (text)
        {
-         gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), text, -1);
+         gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), text, -1);
          g_free (text);
        }
     }
@@ -802,7 +802,7 @@ static void
 gtk_old_editable_real_paste_clipboard (GtkOldEditable *old_editable)
 {
   g_object_ref (G_OBJECT (old_editable));
-  gtk_clipboard_request_text (gtk_clipboard_get (GDK_NONE),
+  gtk_clipboard_request_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
                              old_editable_text_received_cb, old_editable);
 }
 

diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index c39d846e05bc3c145034dfdd01244709564a1338..a24b067f9af93eca9728c6a57c7d6c67cb05aa8d 100644 (file)
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -33,11 +33,9 @@
 #include <gtk/gtkmarshal.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
   
+#ifndef GTK_DISABLE_DEPRECATED
 
 #define        gtk_signal_default_marshaller   gtk_marshal_VOID__VOID
 
@@ -143,10 +141,8 @@ void       gtk_signal_compat_matched               (GtkObject          *object,
                                                 GSignalMatchType    match,
                                                 guint               action);
 
+#endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_SIGNAL_H__ */

diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 14fcf3d2c60929f9c097597a085981eefb5c9fe5..3e7332b9f3995f31c9df8147dceb692aa650bfc8 100644 (file)
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -451,6 +451,7 @@ GdkPixbuf*  gtk_style_render_icon     (GtkStyle            *style,
                                        GtkIconSize          size,
                                        GtkWidget           *widget,
                                        const gchar         *detail);
+#ifndef GTK_DISABLE_DEPRECATED
 void gtk_draw_hline      (GtkStyle        *style,
                          GdkWindow       *window,
                          GtkStateType     state_type,
@@ -604,7 +605,6 @@ void gtk_draw_layout     (GtkStyle        *style,
                           gint             x,
                           gint             y,
                           PangoLayout     *layout);
-
 void gtk_draw_resize_grip (GtkStyle       *style,
                            GdkWindow      *window,
                            GtkStateType    state_type,
@@ -613,6 +613,7 @@ void gtk_draw_resize_grip (GtkStyle       *style,
                            gint            y,
                            gint            width,
                            gint            height);
+#endif /* GTK_DISABLE_DEPRECATED */
 
 void gtk_paint_hline      (GtkStyle        *style,
                           GdkWindow       *window,

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 635368757a2095490c72632023b48792d341c41c..758934878f933cba062efacc16fce8b6620f247b 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4254,7 +4254,7 @@ static void
 gtk_text_view_cut_clipboard (GtkTextView *text_view)
 {
   gtk_text_buffer_cut_clipboard (get_buffer (text_view),
-                                gtk_clipboard_get (GDK_NONE),
+                                gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
                                 text_view->editable);
   DV(g_print (G_STRLOC": scrolling onscreen\n"));
   gtk_text_view_scroll_mark_onscreen (text_view,
@@ -4266,7 +4266,7 @@ static void
 gtk_text_view_copy_clipboard (GtkTextView *text_view)
 {
   gtk_text_buffer_copy_clipboard (get_buffer (text_view),
-                                 gtk_clipboard_get (GDK_NONE));
+                                 gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
   DV(g_print (G_STRLOC": scrolling onscreen\n"));
   gtk_text_view_scroll_mark_onscreen (text_view,
                                       gtk_text_buffer_get_mark (get_buffer (text_view),
@@ -4277,7 +4277,7 @@ static void
 gtk_text_view_paste_clipboard (GtkTextView *text_view)
 {
   gtk_text_buffer_paste_clipboard (get_buffer (text_view),
-                                  gtk_clipboard_get (GDK_NONE),
+                                  gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
                                   NULL,
                                   text_view->editable);
   DV(g_print (G_STRLOC": scrolling onscreen\n"));